From 4147c657c7420ced905d2676f0e3d3017d849abc Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sat, 17 Nov 2018 03:18:00 -0600 Subject: [PATCH] Do not supply default settings, let the component supply defaults --- src/pgwui_server/__init__.py | 7 ------- tests/test___init__.py | 8 -------- 2 files changed, 15 deletions(-) diff --git a/src/pgwui_server/__init__.py b/src/pgwui_server/__init__.py index 57cbbb6..68e43e8 100644 --- a/src/pgwui_server/__init__.py +++ b/src/pgwui_server/__init__.py @@ -126,12 +126,6 @@ def validate_setting_values(settings): boolean_setting('pgwui.validate_hmac', settings) -def supply_default_settings(settings): - '''Supply sensible defaults for omitted settings. - ''' - settings['pgwui.default_db'] = '' - - def do_validate_hmac(settings): '''True unless the user has specificly rejected hmac validation ''' @@ -157,7 +151,6 @@ def validate_settings(settings): for key in settings.keys(): abort_on_bad_setting(key) validate_setting_values(settings) - supply_default_settings(settings) validate_hmac(settings) diff --git a/tests/test___init__.py b/tests/test___init__.py index 469989d..b7588e8 100644 --- a/tests/test___init__.py +++ b/tests/test___init__.py @@ -143,12 +143,6 @@ def test_validate_setting_values(monkeypatch): assert boolean_setting_called -# supply_default_settings() -def test_supply_default_settings(): - '''Something is changed in the supplied settings''' - assert {} != pgwui_server_init.supply_default_settings({}) - - # do_validate_hmac() def test_do_validate_hmac_none(): @@ -218,8 +212,6 @@ def test_validate_settings(monkeypatch): mock_abort_on_bad_setting) monkeypatch.setattr(pgwui_server_init, 'validate_setting_values', lambda *args: None) - monkeypatch.setattr(pgwui_server_init, 'supply_default_settings', - lambda arg: arg) monkeypatch.setattr(pgwui_server_init, 'validate_hmac', lambda *args: None) settings = {'key1': 'value1', -- 2.34.1